-
Notifications
You must be signed in to change notification settings - Fork 154
Update smithay with layer shell updates #1726
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
Conversation
8834505 to
6b28e33
Compare
|
Reading though the relevant |
6b28e33 to
60509a6
Compare
|
This should fix pop-os/cosmic-epoch#2199, though that appears to be an inconsistent race condition that may not be easily reproducible. The layer |
Drakulix
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks mostly good to me
| .last_acked | ||
| .as_ref() | ||
| .is_some_and(|configure| configure.state.size == current_server.size) | ||
| { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can't we simplify this whole thing with the new with_committed_state helper or am I misunderstanding how that works internally? Seems to me, that we don't need to manually check the ack'd serial.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, I guess with_committed_state() would work here; though we also use states.data_map, in addition to the states.cached_state, to get the current_server_state().
I guess it wouldn't really be a problem to take the with_states lock twice (but not at the same time) here? Though it might not simplify things much.
Reduces a bit of duplication.
Updates for `last_acked`, etc. API changes in Smithay/smithay#1817. Includes layer shell fixes from Smithay/smithay#1819.
60509a6 to
c30e3d5
Compare
|
Rebased and updated to smithay commit including fix in Smithay/smithay#1853. |
Update to smithay from Smithay/smithay#1819.
Some changes are needed to adapt to Smithay/smithay#1817. Even after looking at the changes there, I'm not entirely sure how the replace
configure_serialandcurrent_serial...